bitkeeper revision 1.1041.14.2 (40eb35f5_GSsnSungjl4iDktfjy3Iw)

Linux 2.6 based arch (ia64) needs extra include here

diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h
index c9eaae530af0f3d87dcd821a4c57070489caa4b5..7109d87909202547fec08c2c26d5a9cdfb84d1a5 100644 (file)
--- a/xen/include/xen/mm.h
+++ b/xen/include/xen/mm.h
@@ -3,6 +3,9 @@
 #define __XEN_MM_H__
 
 #include <xen/config.h>
+#ifdef LINUX_2_6
+#include <xen/gfp.h>
+#endif
 #include <xen/list.h>
 #include <xen/spinlock.h>
 #include <xen/perfc.h>

diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h
index 976a12bbe3e90d99581de5b19e64a55a3d058ebb..3abb0d51783cabe0dc168151514da8442804b134 100644 (file)
--- a/xen/include/xen/sched.h
+++ b/xen/include/xen/sched.h
@@ -4,6 +4,9 @@
 #include <xen/config.h>
 #include <xen/types.h>
 #include <xen/spinlock.h>
+#ifdef LINUX_2_6
+#include <linux/thread_info.h>
+#endif
 #include <asm/ptrace.h>
 #include <xen/smp.h>
 #include <asm/page.h>